Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Thu, 5 Apr 2007 14:11:49 +0000 (15:11 +0100)
committerTim Deegan <Tim.Deegan@xensource.com>
Thu, 5 Apr 2007 14:11:49 +0000 (15:11 +0100)

Trivial merge